Add mounting /sys for 2.6 xm-test images.

Signed-off-by: Daniel Stekloff <dsteklof@us.ibm.com>

diff --git a/tools/xm-test/ramdisk/Makefile.am b/tools/xm-test/ramdisk/Makefile.am
index 0cdca83c800ad48c49a4e555189d875efdd1123d..2912f7579bb69eb84bc62d25cd18862d8d239bb9 100644 (file)
--- a/tools/xm-test/ramdisk/Makefile.am
+++ b/tools/xm-test/ramdisk/Makefile.am
@@ -14,6 +14,8 @@ HVM_SCRIPT = bin/create_disk_image
 XMTEST_MAJ_VER = $(shell echo @PACKAGE_VERSION@ | perl -pe 's/(\d+)\.(\d+)\.\d+/\1.\2/')
 XMTEST_VER_IMG = initrd-$(XMTEST_MAJ_VER).img
 
+EXTRA_ROOT_DIRS = sys
+
 if HVM
 all: initrd.img disk.img
 else
@@ -36,7 +38,8 @@ $(BR_IMG): $(BR_SRC)
 
 $(XMTEST_VER_IMG): $(BR_IMG)
        chmod a+x skel/etc/init.d/rcS
-       (cd skel; tar cf - .) | (cd $(BR_SRC)/$(BR_ROOT); tar xvf -)
+       (cd skel; mkdir -p $(EXTRA_ROOT_DIRS); tar cf - .) \
+               | (cd $(BR_SRC)/$(BR_ROOT); tar xvf -)
        cd $(BR_SRC) && make
        cp $(BR_IMG) initrd-$(XMTEST_MAJ_VER).img
 

diff --git a/tools/xm-test/ramdisk/skel/etc/init.d/rcS b/tools/xm-test/ramdisk/skel/etc/init.d/rcS
index fd3113f0a7b59d020aee359d6b13a3ec78eb29b4..b3a92109e93746bd82eda8cf2a5b1623c85f9b16 100644 (file)
--- a/tools/xm-test/ramdisk/skel/etc/init.d/rcS
+++ b/tools/xm-test/ramdisk/skel/etc/init.d/rcS
@@ -2,3 +2,7 @@
 
 mount -a
 
+# If we're running 2.6, make sure /sys is mounted
+if uname -r | grep -q '^2.6'; then
+       mount -t sysfs none /sys
+fi